Added a few fixes. Needs more.