Improvements thanks to pantlesswonder

https://github.com/pantlesswonder/robojardeuce