cleanup & bugfix in xdraws().