minor cleanup / ability to skip straight to level