fixed some switch statements to properly use the default clause