added images and fixed bugs with association