bug fixes and license switch