A few improvements on usability