Setting some of the beta small fixes liveA small fix that brings the beta changes and bugfixes to live