minor fixes and license headers