Corrected some bad merges that stomped on some work.
Added my variables to the install page, so that they are removed properly.