Reorganized Pusher a bit, cleaned a little.