progress in pusher and fix errors