Cleaened up build and upgraded to nag 4.0.5