syntax styling and small fixes