Renamed R,C,D in PoElli
Fix previous commit screwups + cleanups to PoElli