Further cleanup and debug of md5.