Updated functions and help