Bug fixes + Some updates
Bug Fixes + Some Updates