image fixed
many changes