usablity improvements, bugfixes