switched to WMFS2, minor update of other files