Multiple panel support, and some improvements to normalization.