various bug fixes and implemented better methods for retrieving and manipulating the objects