Did some code inspection, improved User api, &c.