format fixes, margin edits