solved issues #5 and #10 with correct going into new lesson after end of current