Updates

- Update loop to prevent crashes
- Update Interfaces
- Adding references