[-] some fixes