Document and finish up some refactoring
Bumping beta version, hopefully ready to go