Flappy

a few more flappy fixes