- small potential bugfixes