more edits, and a rebuild on a 8-core machine