some bug fixes and changes anticipating WFS 2.0.2