did some more icode stuff