Fixed a few issues in single target attack analysis

Caused by introduction of multiple target analysis. The current codes
is not clean enough.
Xcode project file is updated