Fixed bugs and almost complete task