Updates  to  and fixes some syntax errors