Few more syntax fixes, still debugging.