minor tweaks after testing