sand -E and other improvments