fixed lens draw and other cleanup