1) Fix userId / customerId mixup
2) small fixes / cosmetics