comments
Some API fixes to targets controller
API fixes
massive merge