Added breaks to the giant switch. Also made lots of small clean-ups.