More nif optomisatioons, and editor markers removed if trishapedata name