some code cleaned up, header comments added, some rearrangements made, files added, ready to save changes