Fixes and more data