Fixed last couple changes
Merge branch 'whizzgraphics' of github.com:rattboi/gateboy into whizzgraphics