fix hint and command parsing