fixes, new utilities