Make several small changes to @saivann's POW update