removed switch statments (because I don't like them & are not necessary right now - tweaked a few other things