fixed bugs
fixed bugs + image