Fixed bugs and shit