Quick Patch

Fixed some bugs and did some balance adjustment