Complete issue #118

Port adding TODO and fixing log typos in Pusher class