fixed issues

Problems with device files not building, had to fix some issues still pointing back to d2spr.