keywords, metadata and minor fixes on 42 cmses
resolved conflicts