Connection + Other Minor changes

- Fixed connection issue
- Made other data related changes