fixed all the bugs. Things work again
Merge pull request #3 from lydianimosa/steven_branch

fixed all the bugs. Things work again