errors corrected in the acknowledge process and some todos removed