Some clean up + text correction and todos