bugs Fixed