fixes, added utils