Fix syntax errors; working although not working (oxymorons? I love it these days :D)