Cleaned up code, added Customer Activation emailing and did updates requested by Peter.