A great manu changes + bugfixes
Added type expansion, basic test now compiles