Main Edits

still more edits
Major edit

changed a lot this time.