changed output, minor corrections