Improved Game Play & Fixed Bugs