final tweaks for beta