#14 build and wfs bug fix