Some more todos added