Cleanup of .ly files, new engravings with 2.18

Also fixed some really ugly code, though lots more remains.