Changed names of action functions. Bug fixes.