Bug fixes and ease-of-use improvements