Shuffle lists, timer's bugs fixed