Introduced bugs fixed, worst is the infinite loop, others

are mainly variables names in asserts