fixing option updates
fixed bad  prepare and changed second prepare