hotfixes
fixed edit
Merge branch 'feature/hotfixes'