Shuffle and repeat now work better, more settings added