Fixes, and I forgot to commit headless.js, derp.
fixes fixes fixes