fixed many usability details