Minor fixes and changes
Object identification overhaul