patchwork of props and other changes in debuggin, some from flo preview, most from 10/20 binaries