Small fixes and comments added