add debug and more feedback