Fixed some things and formatting changes