Update notes for submitted changes

* Clean up extra modules code
Update notes for submitted changes

* Improve error reporting on import failures