Adds comments and minor changes