Syntaxe and a few bugs fix