Various edits here and there
Small edits

Mainly just testing, so largely commented out test code