Bugs Resolved

Bugs Resolved