Various improvements
Merge remote-tracking branch 'SAPlayer/minor-fixes'