fixing some fns.