Added several comments.
Fixed small convention mistakes.