Fix build from earlier commit. Also, fixed error in normalization. And other stuff.