several formatting fixes