alpha bugfixes and updates