fixed the populateusers call, and more misc cleanup