misc: cleanup, misc changes