Iterations on Bugs

It's not all fixed....