Some polishing up and commenting