RWD & bug fix

The RWD has took me long time to finish. I do need to release everyday
from now on.