change lots of stuff, add numbered lines etc