Updated Object Annotater + minor fixing