- added additional logs
- fixed regex