Edits from Victor, final formatting changes and change log entry