Squashed a couple bugs, version bump