Added polar norm and tweaks