small Improvements of Usability