Background Updated.

And other code refactoring.