some more todo entries closed