updated Rolands class headers, rid warnings