Final beta 1 tweaks