Updated & Fixed Bugs