Files left out of previous commit

Committed the previous commit while in a hurry to leave. Modified files were left out.