updated some wording and incorporated @scopatz's comments
a few cosmetic corrections
removed old files