Updates & Fixed Bugs