some bugfixes and shortcuts