several improvements when submitting task