pretty much done

all seems to work as expected/needed