modified several files : added default keywords/values