Changed names of action functions. Bug fixes.
Merge branch 'working-copy'
Bug fixes. Updated the names of the controller functions.