some fixes, some new things