Rework item finding & parsing
Tidyups