INDEV/INDEV2: Final Updates

+ Minor changes before final commit