added Flip control, minor improvements