Ww3 feature/clean up

A few more clean up fixes.