Corrected comments, minor fiddling