numerous small fixes, cleanup. wms + filter tests