fixes verify, add set-password + some reformatting