remove debug, tweak UI feedback