picture notification and some drive by bug fixes