changes to function names, fixes
fix