Updated userman and some tweaks to infrastructure