filenaming changes in merge, and also removed some old commented out junk from testing merge