- Fixed the resolve loading
- Expanding on comments