removed a few dupes, minor fixes