minor changes to improve usability