fixed timing and some spacing