super code cleanup and markers working