Fix bugs and update object list implementation