Apply pivotal changes

Summary

fixed dependency failures
fixed failures in Firefox
made error messaging more concise