Fixed some more problems.

Is there an end?