A few corrections and todos added