A few extension detection changes and random notes.