Cleaned-up system info.
Some other minor improvements.