Fixed Turn Tracker bugs and discard enabled button bug