minor tweaks and whatnot