plugin infrastructure updates, and working disaster plugin