fixed function names
fixed errors
Merge remote-tracking branch 'production/development' into development