fix some more brush bugs, remove alt-sample brush