commenting and other small things