171214 Some more fixing, some more Todos