Some fixes

- unit conversion 1/x -> (x)**-1
- regex improvements ?