removed greyed-out junk lines, added relevant comments