comments cleaned up, corrected