Various updates + formatting changes