fixes and new things