Changed some labels (variables = outcome variables) as req in #89 plus some more changes