Fixed bugs, updated scenario