Small Fixes

- Figured out the looping problem
- Need re-coding
- All of it :3