[1.2.5a-6] Bugfixes and improvements.