Fixed bugs and something