Cleaning up sytax errors, trying to get a clean build before continuing