Some syntax fixes, 50% done. ;)