[fix] some features and bugfixes