todo's fixed a bit
added nirex test script