FIX: Speeding up dpss, minor fixes