more edits. slightly over limits now