some fixes that will require more work
bold