Fixed a lot of stuff to do with objects and method calls.