commenting and other fixes