Added OxDefaults and other minor cleanup.

Closes #25.