Fix problems with commenting and other small bugs.