format and context fixes