some more minor fixes
Merge branch 'master' of https://github.com/susha644/wdc