Make MS working again, add MS norm scaling