fix some formatting and other stuff