some typos + image optim