Final commits for tonight.
made sure some things matched, and started into debugging what is going on.