better regex
add completion for globals