Added mouse and keyboard analyzers, and made some other adjustments