A few tweaks; moving to next verison of alpha
Whoops, fixed a merge conflict