several usability improvements