fixed up some rebeca stuff