Better timing of the updates, better console

Needs refactoring