fixing attack, adjusting TARGET_LIFE_CHANGED intent,  cleaning up