Improve usability, fix bugs