add methods, fix utils