chore(refactor): adding some debugging features