usability improvement, bug fixes