[*] added some bugfixes