cruft
misc changes