final changes before attempting connect to firebase