Original commit message from CVS: Assorted fixes. Use the new clocking stuff.
Original commit message from CVS: first batch