removed a dupe, minor fixes