fix incomplete switches
update for 10.9 & Xcode 5.1.1