Fixed some things.

should be working pretty good now.