[-] fixed some bugs