fixed some compiler yelling for darwin/clang
fixed one last switch statement