Fixed Warnings + Bugs