Add changes that hopefully Wliu likes.

Also haven't made debug cvar useless like last time.