fixed a lot of bugs, works with contractions now