fix several formatting issues