add comment
switch to country iso codes
remove text shortened comments
add linebreak