edited

edited few functions