A few more fixes and todos for requesting and displaying images