Repairs Underway

Repaired files from GitHub errors; manually reconciled new code.