more improvements in usability