misc changes and update to ef6