Added system info classes and fixed a few minor bugs.