Fixed bugs. :(