added in support for object lists and dicts
fixing bugs