fises and tweaks 2