fixed usability and logic bugs