Feedback, fixes, and tests.