some usabilty improvements