Correct bugs and update project