Cleanup
Added a nrm2 implementation
Merge to master