Fixing README and adding/renaming a couple options