Multiple improvements in the SituationAwareness plug-in.