reworked logic
a few cleanup in one-off command
docs update and version bump