Fixed files and a couple of syntax issues