Hide upfade and downfade cases
Fix various bugs