Further bug-fixes, object hierarchy introduced