Added cylinder & cube gen code, refactored some otehr stuff