various tweaks and whatnot