minor updates from darcs