Made various smaller changes, like removing lemmas, and replacing absolute by
relative numbers.
Fixed merge conflict.