changed how customer info is loaded, still needs to be formatted
fixed merge issues