3.4.5 No user input when image is invalid

Also refactored out some annoying names
'att' -> 'ann' (For annotation)