Need this EA to be fixed

A) This EA needs to be slightly modified. The EA is supposed to take trades based on the CLOSE of the previous bar. I.E. if the previous CCI bar closes green then a buy should open up and that order should STAY a buy until a red bar CLOSES. Once an opposite colored bar closes, a trade in the opposite direction should open. Currently the EA takes the trade based on the current bar, which means if the EA is set on a 5 minute time frame and that bar changes from red to green several times then it takes several trades instead of waiting for that 5 minute time period to end. The EA takes approx. 20-30 trades a session when it should be taking around 5. 

B) The second modification I would need is for the EA to take profit and then not open another trade until a bar of the opposite color opens again. I.E. If a bar closes green, the EA should buy and take profit to 10 for example. Once tp of 10 is hit then the EA should not take any more trades until a sell signal closes, thus opening a sell position. This should be an available option. 

 I'm more concerned about A being fixed than B if that is all that can be done. 

The indicators and current EA to be modified are attached.

If it is more confusing to modify the EA than create another one, then that is fine as well just make sure the same options that are available in the first EA are also available in the new one.