Some comments and a little cleanup of commented code.