Usability improved, small bugfixes