remove wv support & fix bugs