fixing some data related issues