Pre-Alpha Changes.

Basically, fixes a lot of stuff that should have been fixed in the
"Alpha" release.