Use \cvlanguage and \cvcomputer. Minor changes.