extended double-data, added incident-related classes, some improvements to app-classes