General cleanup
Updated to support vars for user
Added var for user
updated