Major bug fix iteration

Major bug fix Iterations.