tweak more
update and fix debug msg