Submit update works. General tidy up.