small tweaks & fixes