Commit merge successful, minor fixes made.