Final beta changes

Changes to bring the repo up to date with my current branch. I'm using this in production with wp4.