Fixing 3 bugs + better and more simple tokenizing