various fixes, refactors

clean up places where we ask for history changes, fix other little things.