fixed up quick updates, fixed misuse of case statements