Some minor additions (titles) and fixes