Todos and small changes