Final fixes for alpha. Now beta.