Correct various syntax errors
Add phutil