wip: misc tweaks and fixes