fix usability and coding errors and problems