Removed unrecognized options. Minor packaging improvements.