Added console log to debug on deployment
Merge branch 'dev'
Updated variables to be consistent with what is being received from client
Merge branch 'dev'