Rewriting a couple of things, getting ready for public release