- comments
- typos
- more exception handling