some debugging and cleanup.

_test in other project works with the lib