finished D3plus updates/fixes