Edit weirdnesses and todos