Improves detection
Fix argument out of range
Fix null ref when shutdown
Command Manager is now Active Keyboard aware