Fixed a couple bugs, inc'd to 1.3.1