Several miscellaneous formatting/helpme fixes