cleanup & image sources added