Ready to roll
Fixed some bugs.