Simplified Customer object and fixed a bunch of stuff