better comments & tracing
misc