Bugs fixed according corrections in lesson5