Added KDR conversion; Renamed some things