added small tweaks