Added CMAT source, changes to host and autostart