Small bugfixes and usability changes