Fixing some naming of scope variables and making options optional (now that you can set app-wide config this makes a lot of sense).