User fields

Added user fields and some cleanup