Fixed bugs with objects, added in more support for messaging