Beta Fixes

A few more beta fixes here going into develop.
I've updated the version number (i think)

Can we get this merged to release after develop and get Beta 5 out the door?