some additional small tweaks