made some changes for changing password separately from other content, will merge
removed junk file
fixed merge, seems to work fine