DSfW
NSS errors
fixes ready