fixed warnings, fixed some style in synch