[*] low bugfixes and clean