edits accroding to feedback. Release v2.1