Fixed Bugs & Increased Performance