fixed typos + some refactoring in ObjectCollection class