small fixes/tweaks