some small updates and todos