bug fixes and license changes