improvements and more data
slight fix