Add some missing comments, lower-case some local variables that shouldn't have been upper case.