last minute bugfixes :)