Added misc todos