fixing a few things and more realignment with trunk.