Bug fix
Fix topic promise
Many fixes