Added chosen variables to usability improvements feature. Fixes #11