paint system fix (hack)

some cleanup in the game and entity system