many sintactical fixes