Architecture + matrix + minor fixes