Fixed Minor Bugs
Fixed Minor Bugs