contractor edit, minor changes to other files