[*] fixing a couple bugs