A few bug fixes for the subscreens.  Paused working on quick jumps to
run a quick test.