Add alt-classes and bugfixes that were never commited to svn... thank you, whoever didn't do that :p