Fixed incorrect version bump & various formatting changes