Removed OverlayHandler from ObjectHandler
Fixed a few things