+ started to organize, cleanup and expand the exceptions a bit
- fixed IAM init