syntax adjustments, add comments