last minute bugfixes