Fixed some data bugs including issue #127