changes to complex issues, added unit test for a super complex object.