work on populate debug and fix context bug found