fixes and more data