Final Candidate #2

Misc formatting fixes; re-tested code