import new drw from libsl and minor fixes.