Fixed Massive Bugs