Improve atom rule for interpolation

Interpolation and atoms spanning multiple lines do not work yet.
Realign rule lines