Added more corrections and unfortunately more todo notes...