Improved "mode" and satellite stats
Improved "mode" and satellite stats
Merge remote-tracking branch 'origin/master'