Added todos and changed run parameters