small tweaks after testing