improvements for usability