Madrid WS summary: fix typos, add next WS info, add a short summary on
template library