More annotations and various minor adjustments.