fix tap output
fix context messages