ic
some improvements
fixes