updated all final issues