Final changes in preparation for the Alpha. Bugfixes mostly.