Some minor fixes and comments