minor corrections and more todos