minor changes to User and Variables