ic
ic
minor fixes
some fixxes