Bug fixes and more data grabbing.