Update

- get rid of given/when structure, less warnings with perl 5.18
- add some more typo cases