fix some issues with the