small tweaks needed