Add, remove lines
Some stability improvements