Improves to speed in submit, solved possible issues with parts of the code, #390 gilbert feedback issue still unable reproduced