improved handling

no longer flips, handling changed a bit