Bug fixes and improved usability