fixed some fading issues