some cleanup; non-flushing (translateSimple) still needs fixing