a few fixes/tweaks