data bugs fixed