Data fix

This pull request fixed some problems I found in data. Should fix #81