Changed some public methods in manager to private. Some inconsequential
changes.