Minor improvements

- Added multiple word tag support
- Errors for end of found images or finding none are now handled
properly
- Revamped structure before integrating different sources