took image overlay aware for standalone reasons; code cleanup