add payments, many small tweaks