chore(*): better logging and minor fixes