Beta changes

Pushed alot of stuff to xml