Bugfix regarding naturally discovered private users...an anomoly. Also updates on api-count related waits.