Fixed bugs and passed off