Some Fixes in FrameWork, cosmetic changes