rwd update & more changes