Fixed a bug and tuned some more

Connor