bugs fiexed in these files