Fix bugs passed over from laptop. Work on OMM ObjectModel class.