big changes, added wms, etc