repaired potential bug in base_cls storage for objects
repaired potential bug in base_cls storage for objects
more cleaning up