Clients now have an Id assigned to them

- General Bug Fixes
- Misc changes