Fixed

Removed Bugs