Pkg fixes

trying to join all efforts for solving the pkg issues.

still working on a docker based test
This could be simplified to just `return v.group(1)`