More docs, improvements around variables and identifiers