updates on going bug fixes