cleanup variables-view patch queue. tested new patches from victor