almost finish fixes