Tidy up settings + fix buffer overrun in mp3 player