Fixed time control
Cleaned up some messages
UI cleanup