Fixed glitches

One section runs smoothly, second section is really high. Very many
teacher errors.