minor fixes/tweaks