Updated to 1.6.1, and also squashed a few bugs!