Some end-of-update cleanup and refactoring
Implement fixed and late update in-loop functions