Some bug fix and some typeset.