Conversion to 18-band split and fixed a few related bugs.