Ww3 feature/clean up

This cleans up a few things as well as include some small new functionality.  There are still some errors in the Library Browser, but I plan to make that a separate pull request.