fixed bug for today, fixed follow case for call, added new func to optimize code in contains.