A lot of commenting and minor changes