Fixed bugs and everything done