-- A few organizational changes
-- bugfix draw in gameobject