a handful of tweaks and fixes