fixes/improvements to levels 1, 2, 4, 5