Flappy

couple more bug fixes