scratch-pop and minor fixes