Bugs Fixed Parcially