[fea] make review
[wip]
[wip]
[fix] some features and bugfixes
[fix] merge
[bump]