Lots of clean up to variables and bug-fixing on dimensions, still needs a fair bit more. Added shaft collars :)