- Fixing more data and minor bug fix