Adding further changes. Fixed a few bugs - Also testing webhooks