fix issue #97, issue #158, fix a plot typo, and happy 1000th commit