Couple minor bug fixes

Also if a bug occurs while going mouse and keyboard to controller or vice versa and the subtitles stop working, resetting the option seems to fix it. Still working when I have time for a better fix on that