Improvements to beautifier and syntax checker mainly