objecter bug fixes and cleanup, full handling