Some more syntax fixes. This version actually builds.