small fixes to functionality and wording