bug fixes synch