More changes and todos