Fixed bugs before 2nd meeting