Lots of Refactoring and bufixes

Also trying to get playerDrawing working.