Added my FUNCTIONS FILE/HCAPP fixes to beta

Info in commits.