Made repl not split out the arguments, and fixed some bugs