More levels (up to 17), minor fixes