Many Minor fixes.