Fixed some timing bugs and display errors