keywords and subject identifier
removed some todos