Fixed textual glitches from race conditions
Cleaned up code and changed some assumptions