An addition to the bib and clean up of WMS