cleanup comments
fix context binding mode logic