Clock working again.
Fixing the pretty printer to be nearer what a human might write.