Develop

Restored compilation and fixed error reporting