Fixed incorrect firebase url's and converted more code