bug fixes and objjjjects

bug fixes and objjjjects