Fixed nits and used listeners whenever it's possible
Merge pull request #171 from beaufortfrancois/fixSystemInfo

Fixed nits and used listeners whenever it's possible