final fixes to beta