Minor updates

- Regex fix
- Parser tweaks