Minor formatting changes & bugfixes