License updated and minor fixes.