Lot of Fixes !!