more formatting fixes and conversion stuff