Fixed a couple bugs for you