end of weekend changes
Ui changes
added better collision detection and started cleaning up code by moving functions out of objects into util