Modified
Minor bug fixes and usability improvements