A bunch of changes. Forgot to update here for a bit.
This version is a bit ahead of the current release.