Tweaks to make dealing with users easier and added admin functions