Fixed Changin user name along with some other minor fixes