Fixed bugs and Pass off ready