minor improvements suggested by prospector/landscape