Finished leaning up of wprld plugin; some other minor name fixing