Fixed More Bugs