Small bug fixes and new little features