some fixes and new things