Fixed Extreme Bugs