Better error signaling for Armando.
Reworking main interfaces.