Bug/payment counts

Closes #1310