Usability stuff and bug fixes