Bugs

More problems with my object stupidity.