Syntax changes, heavier comments