Minor TYPO, variable name changes and fix stop method of Daemon