Bugs Fixed

Bugs Fixed