some tweaks 2