added new usability features, stage 1 of 3