More syntax tweaking. I really need a proper parser soon.