Customer improvements

Closes #2 
Closes #6 
Closes #10