few improvements on performance and usability