fixing more syntax errors. Almost to a runnable state