Missed a break in my switch; also fixed fade across