fix #28 plus title on two lines, and some other minor fixes.