Further clean up for first version
National Geographic plugin now works