Make parameter-reading work; clean up flight a little

Nothing worthy of being on a branch, but definitely releasable.