small fixes & tweaks