made some more fixes according to wvu