Commented out stuff that should have been.
Removed typo I made.
Improved comments/whitespace from last time.
Made tests work again by suppressing output.