Small changes, bugfixes and usability improvements