This pull is any last minute changes and fixes - r6