michaels
committed
on 20 Nov 06
a little more cleanup and use of the cr api