Cleaned up interface. Fixed & improved sync.