Numerous tweaks for public alpha