Comment editing and some last minute fixes