just some commenting and whitespace fixes