More cleanup and stuff, including changing from elifs to Java 7 switch w...

...ith strings statements