added csi test
small changes to input + clean up
more clean up
no need for extern (yet?)