Customer Ficxes
Merge pull request #353 from sandal-smuggler/customer-fixes

Customer Ficxes