Continued commenting and editing stuff