Fixed some small format errors, needs more fix still