Ready for Beta

Final tweak, ready for beta