Small bugfix and formatting changes.