Merged changes from another private auction, includes various generic changes, all for the better.
Set all of the indentation to 2 spaces.