const aliases fixed and docs improved