Fixed/removed some TODO!s in S2