Comments and other minor changes