some fixups for Jzupka start3

See what you think, it's a bit of a pain, but I think it will help in the long-run.