r1: Change versioning to something not completely asinine, implement and fix several features and bugs.