added clear() function to WV_Wrapper, some minor cleanups