and as final for to day a few misc cleanups..