Caps and more comments