General Changes

Fixing issues and trying code that must work ! (and Work Well)