Regex fix, documentation improvement