More corrections and todos...