Added gender property to User and made misc tweaks