changes and fixes in the utils.