Made a bunch of stuff singular... lets pluralize