A bunch of bug fixes, and able to re-trigger finding of users