Fixed fading
more tweaks