Bugfix and prep for release!