small tweaks again