manage pictures done, some bug fixes