Fixed passive aggressive todo's