cleaned up, added more customer stuff