Fixed some subtle bugs and moved swapping letters to Sentence