I've fucked up my last commit or two because I let things get out of sync. This should get everything up to date. Removed stupid style of accesing objects (.radius() changed to .rad, etc.)