Comments, last minute fixes