added forgot password + cleanup and fixes