Fixed a few more formatting bugs