Fixed obstacle drawing (moved to main tick loop)
Refactored main tick loop so not redundant
Removed dead drawing code, refactored so function signatures consistent.