more formatting, fixes