Users now exposed. Minor fixes.