Numerous bug fixes and usability improvments