Some fixes to coverage and sync, adding more dtrace and moving headers to include.