renamed a few things & added traces

all stuff just for better debugging ...