license
rework wrap/unwrap methods
various fixes