some modifications to hsm/ package stuff
(#522)
more license corrections
(#522)