First round of changes, very minor stuff, uploaded the changes before taking a break.