minor changes with commenting