more supported features, bugfixes