scanner fixes. AAAGGGHHHH STOCHASTICSSSS