Fixed sync issues.
Updated the tuner to not throw NPEs ...