Cleanup.
Moo.
Fixing things.
Added a couple of define_*_methods.