Add TODOs, fix different rejection modes