[!] some bugfixes